Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Bugfix] Still support bbox parameter #4513

Merged
merged 3 commits into from
Jul 4, 2024
Merged

[Bugfix] Still support bbox parameter #4513

merged 3 commits into from
Jul 4, 2024

Conversation

rldhont
Copy link
Collaborator

@rldhont rldhont commented Jun 11, 2024 •
edited
Loading

bbox and crs parameter was removed in favor of hash permalink.

Funded by Karum, Conseil Départemental du Calvados, Terre de Provence Agglomération

@rldhont rldhont requested review from nboisteault and mdouchin June 11, 2024 20:15
@github-actions github-actions bot added this to the 3.9.0 milestone Jun 11, 2024
@Gustry Gustry added the sponsored development This development has been funded label Jun 12, 2024
@rldhont rldhont force-pushed the fix-bbox-parameter branch from fd92131 to fb38782 Compare July 4, 2024 11:57
@rldhont rldhont added the run end2end If the PR must run end2end tests or not label Jul 4, 2024
@rldhont rldhont marked this pull request as ready for review July 4, 2024 12:21
rldhont added 2 commits July 4, 2024 14:29
@rldhont
[Bugfix] Still support bbox parameter
6d63d2a 
`bbox` and `crs` parameter was removed in favor of hash permalink.

Funded by Karum and Conseil Départemental du Calvados
@rldhont
[Bugfix] Projects in map: click on project image stay at the same extent
2f9bc77
@rldhont rldhont force-pushed the fix-bbox-parameter branch from 942a8f7 to 2f9bc77 Compare July 4, 2024 12:30
@rldhont rldhont merged commit e066017 into 3liz:master Jul 4, 2024
13 checks passed
@3liz-bot
Copy link
Contributor

3liz-bot commented Jul 4, 2024

The backport to release_3_7 failed:

The process '/usr/bin/git' failed with exit code 1
stderr 
error: could not apply 6d63d2a25... [Bugfix] Still support bbox parameter
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
hint: Disable this message with "git config advice.mergeConflict false"
stdout 
[backport-4513-to-release_3_7 a90cbb5a6] Tests e2e playwright: Catching errors
 Author: rldhont <[email protected]>
 Date: Thu Jul 4 10:49:26 2024 +0200
 2 files changed, 63 insertions(+), 45 deletions(-)
Auto-merging assets/src/legacy/map.js
CONFLICT (content): Merge conflict in assets/src/legacy/map.js
Auto-merging assets/src/modules/Permalink.js
Auto-merging tests/end2end/playwright/permalink.spec.js
CONFLICT (content): Merge conflict in tests/end2end/playwright/permalink.spec.js

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-release_3_7 release_3_7
# Navigate to the new working tree
cd .worktrees/backport-release_3_7
# Create a new branch
git switch --create backport-4513-to-release_3_7
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick de91a533e8f980c6426a248759aec696875ba806,6d63d2a25f63da9058d3680b248ef0b22c76a5c5,2f9bc77f030b8d2f60005b2607a8a5c1966857fa
# Push it to GitHub
git push --set-upstream origin backport-4513-to-release_3_7
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-release_3_7

Then, create a pull request where the base branch is release_3_7 and the compare/head branch is backport-4513-to-release_3_7.

@3liz-bot 3liz-bot mentioned this pull request Jul 4, 2024
Merged
@rldhont rldhont mentioned this pull request Jul 4, 2024
Merged
@rldhont rldhont deleted the fix-bbox-parameter branch July 8, 2024 06:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Gustry Gustry Gustry left review comments

@nboisteault nboisteault Awaiting requested review from nboisteault

@mdouchin mdouchin Awaiting requested review from mdouchin

Assignees
No one assigned
Labels
backport release_3_7 backport release_3_8 bug failed backport map viewer run end2end If the PR must run end2end tests or not sponsored development This development has been funded
Projects
None yet
Milestone
3.9.0
Development

Successfully merging this pull request may close these issues.
3 participants
@rldhont @3liz-bot @Gustry